*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 48763ceef0cceddd4fbb93d561bfcb90bee97203..d0acbc1d5bd4bd700e1ac8b836b2988b09916664 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Oct 23 12:07:57 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_internal): Fix problem
+       where font_desc for widget's context lagged widget's font_desc by
+       one step.
+
 2000-10-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c

diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 85e68a93fe12ee84c381bcea2e738d0b8a04a3c9..456531628e1b7ee2b55ab1b00acf2d80b1ac0bd9 100644 (file)
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -1,7 +1,3 @@
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
-Drawables to Pixbufs
-
-
 <!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
   <para>
     A function of this type can be used to override the default
@@ -19,6 +15,10 @@ Drawables to Pixbufs
 @pixbuf: The pixbuf that is losing its last reference.
 @data: User closure data.
 
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
+Drawables to Pixbufs
+
+
 <!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### -->
 <para>
 
@@ -415,18 +415,18 @@ XlibRGB
   </para>
 
 
-<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
-  <para>
-    gdk_image_get().
-  </para>
-
-
 <!-- ##### SECTION ./tmpl/xlib-from-drawables.sgml:See_Also ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
+  <para>
+    gdk_image_get().
+  </para>
+
+
 <!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
 <para>
 
@@ -515,12 +515,6 @@ Getting parts of a drawable's image data into a pixbuf.
 </para>
 
 
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Long_Description ##### -->
   <para>
     This canvas item displays #GdkPixbuf images.  It handles full
@@ -690,6 +684,12 @@ Getting parts of a drawable's image data into a pixbuf.
   </refsect2>
 
 
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### SECTION ./tmpl/xlib-rendering.sgml:Title ##### -->
 Xlib Rendering
 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ed19d79e4f70b0a4cd855a4d4eba6ae191962d13..e9a2b31605cd0dd6ea68ca667bf09bd8c15adcbb 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3302,7 +3302,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
     {
       PangoContext *context = gtk_widget_peek_pango_context (widget);
       if (context)
-       pango_context_set_font_description (context, widget->style->font_desc);
+       pango_context_set_font_description (context, style->font_desc);
     }
   
   if (widget->style != style)